From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 30 Aug 2010 22:42:25 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6605^2~49
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c8b5e7c6848b9f98c04fccc4829572b571b94ed5;p=emacs.git

Merge from mainline.
---

c8b5e7c6848b9f98c04fccc4829572b571b94ed5